ime: Stop using gdk_surface_get_user_data
authorMatthias Clasen <mclasen@redhat.com>
Sat, 23 Feb 2019 21:52:23 +0000 (16:52 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 24 Feb 2019 03:24:50 +0000 (22:24 -0500)
Use gtk_root_get_for_surface instead.

gtk/gtkimcontextime.c

index 62961eb3b38e8a16b377b37611ee9d6f7c30589f..e18795c89e4974b278cb38b76c42be7649c41b84 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "gtkimcontextime.h"
 #include "gtkimmoduleprivate.h"
+#include "gtkroot.h"
 
 #include "imm-extra.h"
 
@@ -878,9 +879,9 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context)
   if (!context_ime->client_surface)
     return;
 
-  gdk_surface_get_user_data (context_ime->client_surface, (gpointer) &widget);
-  if (!GTK_IS_WIDGET (widget))
-    return;
+  widget = gtk_root_get_for_surface (context_ime->client_surface);
+  if (!widget)
+    return
 
   hwnd = gdk_win32_surface_get_impl_hwnd (context_ime->client_surface);
   himc = ImmGetContext (hwnd);